Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 20:11:55 +0000 (12:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 20:11:55 +0000 (12:11 -0800)
commite386f6ea723b6c030b527914dd864ef016ca63bc
tree7a37d763ddd14ee07653533bc6febb2b34380891
parent80afc7ea9708d6c7ac912a3cb3a87586c548a40b
parentb180942628f0b6547a3dd410bb5cfb050014d5d7
Merge from trunk.